Rename and document the enable-gir option

You can disable introspection now with -Dintrospection=false.

diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml
index 51e5d8e8f580a36a92251ac76ad1bf7543f133a0..32ad404eee725fed8e705cbda57d21363f356d43 100644 (file)
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -384,6 +384,10 @@ How to compile GTK+ itself
             <arg choice="plain">-Denable-mir-backend=true</arg>
             <arg choice="plain">-Denable-mir-backend=false</arg>
           </group>
+          <group>
+            <arg choice="plain">-Dintrospection=true</arg>
+            <arg choice="plain">-Dintrospection=false</arg>
+          </group>
         </cmdsynopsis>
       </para>
 
@@ -480,6 +484,17 @@ How to compile GTK+ itself
         </para>
       </formalpara>
 
+      <formalpara>
+        <title><systemitem>introspection</systemitem></title>
+
+        <para>
+          Allows to disable building introspection support. This is option
+          is mainly useful for shortening turnaround times on developer
+          systems. Installed builds of GTK+ should always have introspection
+          support.
+        </para>
+      </formalpara>
+
       <formalpara>
         <title><systemitem>build-tests</systemitem>
           <systemitem>demos</systemitem></title>

diff --git a/gtk/meson.build b/gtk/meson.build
index 121839d3a9d54ded99ef7eceb9f882447aeb8328..5c31538e9a2d415832201ae0ede835aa1c813311 100644 (file)
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -920,7 +920,7 @@ libgtk_dep = declare_dependency(sources: [gtkversion, gtktypebuiltins_h],
                                 link_args: common_ldflags)
 
 # Introspection
-build_gir = get_option('enable-gir')
+build_gir = get_option('introspection')
 if build_gir
   gir_args = [
     '--quiet',

diff --git a/meson_options.txt b/meson_options.txt
index f3b587a2122fb8c2a79bc1d6fdeb7673a15ed3b1..0377d52b1d43d7656cd7d1f7368f57434a433e1e 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -34,7 +34,7 @@ option('enable-documentation', type: 'boolean', value: 'false',
   description : 'Build API reference and tools documentation')
 option('enable-man-pages', type: 'boolean', value: 'false',
   description : 'Build man pages for installed tools')
-option('enable-gir', type: 'boolean', value: 'true',
+option('introspection', type: 'boolean', value: 'true',
   description : 'Build introspection data (requires gobject-introspection)')
 option('demos', type: 'boolean', value: 'true',
   description : 'Build demos and example programs')